search: remove more dead code

https://bugzilla.gnome.org/show_bug.cgi?id=681797

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 25769d2c42904614611527124abc4176884523ad..f7d6f1a989b0ac5fc029915c565296017284ddbb 100644 (file)
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -234,7 +234,7 @@ const _Draggable = new Lang.Class({
         this._dragY = this._dragStartY = stageY;
 
         if (this.actor._delegate && this.actor._delegate.getDragActor) {
-            this._dragActor = this.actor._delegate.getDragActor(this._dragStartX, this._dragStartY);
+            this._dragActor = this.actor._delegate.getDragActor();
             this._dragActor.reparent(Main.uiGroup);
             this._dragActor.raise_top();
             Shell.util_set_hidden_from_pick(this._dragActor, true);

diff --git a/js/ui/search.js b/js/ui/search.js
index 4b94ba5e0e51ee3061f57cee22700186af680865..7ca35af31ce4facd8a10543f7b8685333aab29c5 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -1,26 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
-const Util = imports.misc.util;
-
-const FileUtils = imports.misc.fileUtils;
-const Main = imports.ui.main;
 
 const SEARCH_PROVIDERS_SCHEMA = 'org.gnome.desktop.search-providers';
 
-// Not currently referenced by the search API, but
-// this enumeration can be useful for provider
-// implementations.
-const MatchType = {
-    NONE: 0,
-    SUBSTRING: 1,
-    PREFIX: 2
-};
-
 const SearchSystem = new Lang.Class({
     Name: 'SearchSystem',
 

diff --git a/js/ui/searchDisplay.js b/js/ui/searchDisplay.js
index 08c1c797efb486e9b7ed77d9b814f5b7aba94002..da4769a368e222188319b107a09bed11367aa991 100644 (file)
--- a/js/ui/searchDisplay.js
+++ b/js/ui/searchDisplay.js
@@ -145,7 +145,7 @@ const GridSearchResult = new Lang.Class({
         return this._dragActorSource;
     },
 
-    getDragActor: function(stageX, stageY) {
+    getDragActor: function() {
         return this.metaInfo['createIcon'](Main.overview.dashIconSize);
     },
 
@@ -231,11 +231,11 @@ const ListSearchResults = new Lang.Class({
 const GridSearchResults = new Lang.Class({
     Name: 'GridSearchResults',
 
-    _init: function(provider, grid) {
+    _init: function(provider) {
         this.provider = provider;
 
-        this._grid = grid || new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
-                                                     xAlign: St.Align.START });
+        this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
+                                             xAlign: St.Align.START });
         this.actor = new St.Bin({ x_align: St.Align.MIDDLE });
 
         this.actor.set_child(this._grid.actor);